lilei 7 月之前
父节点
当前提交
5a370fb0bc

+ 4 - 0
components/kk-printer/index.vue

@@ -269,14 +269,18 @@
 				uni.onBLEConnectionStateChange(function(res){
 					console.log('连接',res)
 					if(res.connected){
+						//#ifdef APP-PLUS
 						plus.nativeUI.toast('设备'+ res.deviceId + '已连接',{
 							verticalAlign:'center'
 						})
+						//#endif
 					}else{
 						_this.closeConnect()
+						//#ifdef APP-PLUS
 						plus.nativeUI.toast('设备'+ res.deviceId + '已断开连接',{
 							verticalAlign:'center'
 						})
+						//#endif
 						_this.isShowSearch = true
 						_this.devicesList = []
 						_this.searchBtnTap()

+ 4 - 0
components/kk-printer/utils/bluetoolth.js

@@ -303,7 +303,9 @@ export function senBlData(deviceId, serviceId, characteristicId,uint8Array,laste
 export function sendDataToDevice(options) {
 	let byteLength = options.value.byteLength;
 	//这里默认一次20个字节发送
+	//#ifdef APP-PLUS
 	const speed = plus.os.name != 'Android' ? 180 : 20; //20; 
+	//#endif
 	console.log("send data 20");
 	console.log(options,byteLength,options.value);
 	if (byteLength > 0) {
@@ -348,9 +350,11 @@ export function catchToast(err) {
 	};
 	let coode = err.errCode ? err.errCode.toString() : '';
 	let msg = errMsg[coode];
+	//#ifdef APP-PLUS
 	plus.nativeUI.toast(msg || coode, {
 		align: 'center',
 		verticalAlign: 'center',
 		duration:'long'
 	});
+	//#endif
 }

+ 10 - 0
harmony-configs/AppScope/app.json5

@@ -0,0 +1,10 @@
+{
+  "app": {
+    "bundleName": "com.iscm.arrow360",
+    "vendor": "example",
+    "versionCode": 1000000,
+    "versionName": "1.4.6",
+    "icon": "$media:app_icon",
+    "label": "$string:app_name"
+  }
+}

+ 56 - 0
harmony-configs/build-profile.json5

@@ -0,0 +1,56 @@
+{
+  "app": {
+    "signingConfigs": [
+		{
+			"name": "default",
+			"type": "HarmonyOS",
+			"material": {
+			  "certpath": "C:\\Users\\Admin\\.ohos\\config\\default_MyApplication_F0YZ2MXifdiB7wHx4_hxYgFmucgwSiA8vVDlDWFxrZI=.cer",
+			  "storePassword": "0000001B3AF388BFA1020A1CE6E7A660F938B0964447D6DED06289CE215A7F1DCD9056EF088DF352A8BF01",
+			  "keyAlias": "debugKey",
+			  "keyPassword": "0000001B7674044E0E89816A6C256437D8CD52F1E92E78E6D24A1C7C6CFFE7C4197C28B6D728402EB67177",
+			  "profile": "C:\\Users\\Admin\\.ohos\\config\\default_MyApplication_F0YZ2MXifdiB7wHx4_hxYgFmucgwSiA8vVDlDWFxrZI=.p7b",
+			  "signAlg": "SHA256withECDSA",
+			  "storeFile": "C:\\Users\\Admin\\.ohos\\config\\default_MyApplication_F0YZ2MXifdiB7wHx4_hxYgFmucgwSiA8vVDlDWFxrZI=.p12"
+			}
+		  }
+	],
+    "products": [
+      {
+        "name": "default",
+        "signingConfig": "default",
+        "compatibleSdkVersion": "5.0.0(12)",
+        "runtimeOS": "HarmonyOS",
+      },
+      {
+        "name": "release",
+        "signingConfig": "release",
+        "compatibleSdkVersion": "5.0.0(12)",
+        "runtimeOS": "HarmonyOS",
+      }
+    ],
+    "buildModeSet": [
+      {
+        "name": "debug",
+      },
+      {
+        "name": "release"
+      }
+    ]
+  },
+  "modules": [
+    {
+      "name": "entry",
+      "srcPath": "./entry",
+      "targets": [
+        {
+          "name": "default",
+          "applyToProducts": [
+            "default",
+            "release"
+          ]
+        }
+      ]
+    }
+  ]
+}

+ 28 - 0
harmony-configs/entry/build-profile.json5

@@ -0,0 +1,28 @@
+{
+  "apiType": "stageMode",
+  "buildOption": {
+  },
+  "buildOptionSet": [
+    {
+      "name": "release",
+      "arkOptions": {
+        "obfuscation": {
+          "ruleOptions": {
+            "enable": true,
+            "files": [
+              "./obfuscation-rules.txt"
+            ]
+          }
+        }
+      }
+    },
+  ],
+  "targets": [
+    {
+      "name": "default"
+    },
+    {
+      "name": "ohosTest",
+    }
+  ]
+}

+ 18 - 0
harmony-configs/entry/obfuscation-rules.txt

@@ -0,0 +1,18 @@
+# Define project specific obfuscation rules here.
+# You can include the obfuscation configuration files in the current module's build-profile.json5.
+#
+# For more details, see
+#   https://gitee.com/openharmony/arkcompiler_ets_frontend/blob/master/arkguard/README.md
+
+# Obfuscation options:
+# -disable-obfuscation: disable all obfuscations
+# -enable-property-obfuscation: obfuscate the property names
+# -enable-toplevel-obfuscation: obfuscate the names in the global scope
+# -compact: remove unnecessary blank spaces and all line feeds
+# -remove-log: remove all console.* statements
+# -print-namecache: print the name cache that contains the mapping from the old names to new names
+# -apply-namecache: reuse the given cache file
+
+# Keep options:
+# -keep-property-name: specifies property names that you want to keep
+# -keep-global-name: specifies names that you want to keep in the global scope

+ 10 - 0
harmony-configs/entry/oh-package.json5

@@ -0,0 +1,10 @@
+{
+  "name": "entry",
+  "version": "1.0.0",
+  "description": "Please describe the basic information.",
+  "main": "",
+  "author": "",
+  "license": "",
+  "dependencies": {}
+}
+

+ 81 - 0
harmony-configs/entry/src/main/module.json5

@@ -0,0 +1,81 @@
+{
+  "module": {
+    "name": "entry",
+    "type": "entry",
+    "description": "$string:module_desc",
+    "mainElement": "EntryAbility",
+    "deviceTypes": [
+      "phone",
+      "tablet",
+      "2in1"
+    ],
+    "deliveryWithInstall": true,
+    "installationFree": false,
+    "pages": "$profile:main_pages",
+    "abilities": [
+      {
+        "name": "EntryAbility",
+        "srcEntry": "./ets/entryability/EntryAbility.ets",
+        "description": "$string:EntryAbility_desc",
+        "icon": "$media:layered_image",
+        "label": "$string:EntryAbility_label",
+        "startWindowIcon": "$media:startIcon",
+        "startWindowBackground": "$color:start_window_background",
+        "exported": true,
+        "skills": [
+          {
+            "entities": [
+              "entity.system.home"
+            ],
+            "actions": [
+              "action.system.home"
+            ]
+          }
+        ]
+      }
+    ],
+    "requestPermissions": [
+      {
+        "name": "ohos.permission.INTERNET"
+      },
+      {
+        "name": "ohos.permission.APPROXIMATELY_LOCATION",
+        "reason": "$string:location_tips",
+        "usedScene": {}
+      },
+      {
+        "name": "ohos.permission.LOCATION",
+        "reason": "$string:location_tips",
+        "usedScene": {}
+      },
+      {
+        "name": "ohos.permission.GET_WIFI_INFO",
+        "reason": "$string:get_networkinfo_tips",
+        "usedScene": {
+          "when": "inuse"
+        }
+      },
+      {
+        "name": "ohos.permission.GET_NETWORK_INFO",
+        "reason": "$string:get_wifiinfo_tips",
+        "usedScene": {
+          "when": "inuse"
+        }
+      },
+      {
+        "name": "ohos.permission.MICROPHONE",
+        "reason": "$string:microphone",
+        "usedScene": {
+          "when": "inuse"
+        }
+      },
+      {
+        "name": "ohos.permission.ACCESS_BIOMETRIC",
+        "reason": "$string:access_biometric",
+        "usedScene": {
+          "when": "inuse"
+        }
+      }
+    ]
+  }
+}

+ 20 - 0
harmony-configs/oh-package.json5

@@ -0,0 +1,20 @@
+{
+  "modelVersion": "5.0.0",
+  "name": "template",
+  "version": "1.0.0",
+  "description": "Please describe the basic information.",
+  "main": "",
+  "author": "",
+  "license": "",
+  "dependencies": {
+    
+  },
+  "devDependencies": {
+    "@ohos/hypium": "1.0.16",
+    "@ohos/hamock": "1.0.0",
+    "@dcloudio/uts-harmony": "./entry/src/main/ets/uts",
+    "@dcloudio/uni-app-harmony": "./entry/src/main/ets/uni-app-harmony",
+    "@dcloudio/uni-app-harmony-framework": "./entry/src/main/resources/rawfile/uni-app"
+  },
+  "dynamicDependencies": {}
+}

+ 8 - 0
harmony-configs/package.json

@@ -0,0 +1,8 @@
+{
+  "name": "template",
+  "version": "1.3.7",
+  "description": "",
+  "scripts": {},
+  "author": "",
+  "license": "ISC"
+}

+ 23 - 24
js_sdk/dc-clipboard/clipboard.js

@@ -6,21 +6,18 @@
  */
 function setClipboardText(text){
 	try{
-	var os = plus.os.name;
-	text = text||'';
-	if('iOS' == os){
-		// var UIPasteboard  = plus.ios.importClass('UIPasteboard');  
-		// var pasteboard = UIPasteboard.generalPasteboard();  
-		// pasteboard.setValueforPasteboardType(text, 'public.utf8-plain-text');
-		var pasteboard = plus.ios.invoke('UIPasteboard', 'generalPasteboard');
-		plus.ios.invoke(pasteboard, 'setValue:forPasteboardType:', text, 'public.utf8-plain-text');
-	}else{
-		var main = plus.android.runtimeMainActivity();
-		// var Context = plus.android.importClass('android.content.Context');
-		// var clip = main.getSystemService(Context.CLIPBOARD_SERVICE);
-		var clip = main.getSystemService('clipboard');
-		plus.android.invoke(clip, 'setText', text);
-	}
+	//#ifdef APP-PLUS
+		var os = plus.os.name;
+		text = text||'';
+		if('iOS' == os){
+			var pasteboard = plus.ios.invoke('UIPasteboard', 'generalPasteboard');
+			plus.ios.invoke(pasteboard, 'setValue:forPasteboardType:', text, 'public.utf8-plain-text');
+		}else{
+			var main = plus.android.runtimeMainActivity();
+			var clip = main.getSystemService('clipboard');
+			plus.android.invoke(clip, 'setText', text);
+		}
+	//#endif
 	}catch(e){
 		console.error('error @setClipboardText!!');
 	}
@@ -28,15 +25,17 @@ function setClipboardText(text){
 
 function getClipboardText(){
 	try{
-	var os = plus.os.name;
-	if('iOS' == os){
-		var pasteboard = plus.ios.invoke('UIPasteboard', 'generalPasteboard');
-		return plus.ios.invoke(pasteboard, 'valueForPasteboardType:', 'public.utf8-plain-text')
-	}else{
-		var main = plus.android.runtimeMainActivity();
-		var clip = main.getSystemService('clipboard');
-		return plus.android.invoke(clip, 'getText');
-	}
+		//#ifdef APP-PLUS
+		var os = plus.os.name;
+		if('iOS' == os){
+			var pasteboard = plus.ios.invoke('UIPasteboard', 'generalPasteboard');
+			return plus.ios.invoke(pasteboard, 'valueForPasteboardType:', 'public.utf8-plain-text')
+		}else{
+			var main = plus.android.runtimeMainActivity();
+			var clip = main.getSystemService('clipboard');
+			return plus.android.invoke(clip, 'getText');
+		}
+		//#endif
 	}catch(e){
 		console.error('error @getClipboardText!!');
 	}

+ 24 - 22
js_sdk/dc-market/market.js

@@ -9,30 +9,32 @@
  */
 function openMarket(options){
 	try{
-	var os = plus.os.name;
-	options = options||{};
-	if('iOS' == os){
-		if(options.ios&&''!=options.ios){
-			//itms-apps://itunes.apple.com/app/id682211190
-			plus.runtime.openURL('itms-apps://itunes.apple.com/app/id'+options.ios);
+		//#ifdef APP-PLUS
+		var os = plus.os.name;
+		options = options||{};
+		if('iOS' == os){
+			if(options.ios&&''!=options.ios){
+				//itms-apps://itunes.apple.com/app/id682211190
+				plus.runtime.openURL('itms-apps://itunes.apple.com/app/id'+options.ios);
+			}else{
+				//itms-apps://itunes.apple.com/WebObjects/MZStore.woa/wa/search?q=helloh5
+				plus.runtime.openURL('itms-apps://itunes.apple.com/WebObjects/MZStore.woa/wa/search?q='+options.key);
+			}
 		}else{
-			//itms-apps://itunes.apple.com/WebObjects/MZStore.woa/wa/search?q=helloh5
-			plus.runtime.openURL('itms-apps://itunes.apple.com/WebObjects/MZStore.woa/wa/search?q='+options.key);
+			if(options.android&&''!=options.android){
+				//io.dcloud.helloh5
+				var uri = plus.android.invoke('android.net.Uri', 'parse', 'market://details?id='+options.android);
+				var Intent = plus.android.importClass('android.content.Intent');
+				var intent = new Intent(Intent.ACTION_VIEW, uri);
+				intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+				var main = plus.android.runtimeMainActivity();
+				main.startActivity(intent);
+			}else{
+				//market://search?q=helloh5
+				plus.runtime.openURL('market://search?q='+options.key);
+			}
 		}
-	}else{
-		if(options.android&&''!=options.android){
-			//io.dcloud.helloh5
-			var uri = plus.android.invoke('android.net.Uri', 'parse', 'market://details?id='+options.android);
-			var Intent = plus.android.importClass('android.content.Intent');
-			var intent = new Intent(Intent.ACTION_VIEW, uri);
-			intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-			var main = plus.android.runtimeMainActivity();
-			main.startActivity(intent);
-		}else{
-			//market://search?q=helloh5
-			plus.runtime.openURL('market://search?q='+options.key);
-		}
-	}
+		//#endif
 	}catch(e){
 		console.error('error @openMarket!!');
 	}

+ 1 - 1
libs/axios.js

@@ -29,7 +29,7 @@ const request = (opts, hasToken) => {
 	let promise = new Promise(function(resolve, reject) {
 		uni.request(DefaultOpts).then(
 			(res) => {
-				console.log(res)
+				// console.log(JSON.stringify(res))
 				// 是否超时已跳转
 				let loginTimeOut = uni.getStorageSync('loginTimeOut');
 				if(res&&res.errMsg.indexOf('request:fail')>=0){

+ 8 - 2
libs/tools.js

@@ -67,8 +67,7 @@ export function delayDel(fn) {
 
 // 图片转Base64,pad 平台
 export const imgToBase64 = function (path,callback){
-	 // plus.nativeUI.previewImage([path]);
-	 // return
+	 //#ifdef APP-PLUS
 	 plus.io.resolveLocalFileSystemURL(path, function (entry) {
 	 	// 可通过entry对象操作文件
 	 	entry.file(function (file){
@@ -92,6 +91,7 @@ export const imgToBase64 = function (path,callback){
 		console.log(JSON.stringify(e))
 	 	uni.showToast({icon: 'none',title: 'Resolve file URL failed: ' + e.message})
 	 })
+	 //#endif
 }
 // 打开摄像头
 export const openCamera = function (type,callback){
@@ -292,7 +292,9 @@ export const checkVersionToLoadUpdate = function(newVersion,type,callback){
 	const curr_version = curVer && curVer.version ? curVer.version.replace(/\./g,'') : ''
 	const server_version = newVersion && newVersion.version ? newVersion.version : '' // 最新版本信息
 	const isQzgx = newVersion && newVersion.forceUpgrade != 1
+	//#ifdef APP-PLUS
 	let isWifi = plus.networkinfo.getCurrentType()!=3 ? '有新的版本发布,检测到您目前非Wifi连接,' : '有新的版本发布,'
+	//#endif
 	let msg = isWifi + (!isQzgx ? '请立即更新?' : '是否立即更新版本?')
 	// 下载app并安装
 	let downloadApp = function(downloadApkUrl){
@@ -300,6 +302,7 @@ export const checkVersionToLoadUpdate = function(newVersion,type,callback){
 			title: '正在更新中...',
 			mask: true,
 		});
+		//#ifdef APP-PLUS
 		var dtask = plus.downloader.createDownload( downloadApkUrl, {}, function ( d, status ) {
 			// 下载完成  
 			if ( status == 200 ) {   
@@ -320,15 +323,18 @@ export const checkVersionToLoadUpdate = function(newVersion,type,callback){
 			}
 		});  
 		dtask.start();
+		//#endif
 	}
 	// 打开ios 应用市场
 	let openIosAppSotre = function(downloadUrl){
+		//#ifdef APP-PLUS
 		//在App Store Connect中的App Store下的app信息,可找到appleId
 		plus.runtime.launchApplication({
 			action: downloadUrl
 		}, function(e) {
 			console.log('Open system default browser failed: ' + e.message);
 		})
+		//#endif
 	}
 	console.log(server_version,curr_version)
 	if(Number(server_version) > Number(curr_version)){

+ 436 - 436
pages.json

@@ -13,40 +13,77 @@
 			}
 		},
 		{
-			"path": "pages/login/apply-trial",  //  申请试用
+			"path": "pages/sales/index", // 销售
 			"style": {
-				"navigationStyle": "default",  //  是否显示导航栏  default显示,custom不显示
-				"navigationBarTitleText": "申请注册"
+				"navigationBarTitleText": "销售",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path": "pages/index/index", // 货架
+			"path": "pages/stock/index", // 库存
 			"style": {
-				"navigationBarTitleText": "货架",
+				"navigationBarTitleText": "库存",
 				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path": "pages/login/userAuthYs",
+			"path": "pages/index/index", // 货架
 			"style": {
-				"navigationBarTitleText": "注意事项及服务协议"
+				"navigationBarTitleText": "货架",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path": "pages/login/forget-pass",
-			"style": {
-				"navigationBarTitleText": "忘记密码"
-			}
-		},
+            "path" : "pages/statistics/index",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "销售统计",
+                "enablePullDownRefresh": false,
+                "app-plus":{
+                	"titleNView": {
+                		"titleAlign": "left",
+                		"buttons": [ //原生标题栏按钮配置,
+                			{
+                				"text": "\ue626 本周" ,//原生标题栏增加分享按钮,点击事件可通过页面的 onNavigationBarButtonTap 函数进行监听u
+                				"fontSrc": "/static/iconfont/iconfont.ttf",
+                				"fontSize": "14",
+                				"color": "#00aaff",
+                				"width":"90px"
+                			}
+                		]
+                	}
+                }
+            }
+        },
 		{
 			"path": "pages/userCenter/index",
 			"style": {
+				"navigationBarTitleText": "我的",
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom",
 				// 将回弹属性关掉
 				"bounce":"none"
 			}
 		},
+		{
+			"path": "pages/login/apply-trial",  //  申请试用
+			"style": {
+				"navigationStyle": "default",  //  是否显示导航栏  default显示,custom不显示
+				"navigationBarTitleText": "申请注册"
+			}
+		},
+		{
+			"path": "pages/login/userAuthYs",
+			"style": {
+				"navigationBarTitleText": "注意事项及服务协议"
+			}
+		},
+		{
+			"path": "pages/login/forget-pass",
+			"style": {
+				"navigationBarTitleText": "忘记密码"
+			}
+		},
 		{
 			"path": "pages/userCenter/changePwd",		//  我的>修改密码
 			"style": {
@@ -80,28 +117,28 @@
 			}
 		},
 		{
-			"path": "pages/xtNotice/xtNoticeDetail/xtNoticeDetail",		//  我的>消息详情
+			"path": "pages/xtNotice/xtNoticeDetail",		//  我的>消息详情
 			"style": {
 				"navigationBarTitleText": "消息详情"
 			}
 		},
-        {
-            "path" : "pages/latePlay/chooseBulk",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "选择货架",
-                "enablePullDownRefresh": false
-            }
-        }
-        ,{
-            "path" : "pages/latePlay/chooseProduct",
-            "style": {
-            	"navigationBarTitleText": "打印贴签",
-            	"enablePullDownRefresh": false,
-            	"app-plus":{
-            		"titleNView": {
-            			"titleAlign": "left",
-            			"buttons": [ //原生标题栏按钮配置,
+		{
+			"path" : "pages/latePlay/chooseBulk",
+			"style" :                                                                                    
+			{
+				"navigationBarTitleText": "选择货架",
+				"enablePullDownRefresh": false
+			}
+		}
+		,{
+			"path" : "pages/latePlay/chooseProduct",
+			"style": {
+				"navigationBarTitleText": "打印贴签",
+				"enablePullDownRefresh": false,
+				"app-plus":{
+					"titleNView": {
+						"titleAlign": "left",
+						"buttons": [ //原生标题栏按钮配置,
 							{
 								"text": "\ue65a 批量打印" ,//原生标题栏增加分享按钮,点击事件可通过页面的 onNavigationBarButtonTap 函数进行监听u
 								"fontSrc": "/static/iconfont/iconfont.ttf",
@@ -109,24 +146,24 @@
 								"color": "#00aaff",
 								"width":"110px"
 							}
-            			]
-            		}
-            	}
-            }
-        },
+						]
+					}
+				}
+			}
+		},
 		{
-		    "path" : "pages/index/printAbc",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "打印ABC",
-		        "enablePullDownRefresh": false
-		    }
+			"path" : "pages/index/printAbc",
+			"style" :                                                                                    
+			{
+				"navigationBarTitleText": "打印ABC",
+				"enablePullDownRefresh": false
+			}
 		},
 		{
-            "path" : "pages/shuntBackManage/shuntBackList",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "调回管理",
+			"path" : "pages/shuntBackManage/shuntBackList",
+			"style" :                                                                                    
+			{
+				"navigationBarTitleText": "调回管理",
 				"enablePullDownRefresh": false,
 				"app-plus":{
 					"titleNView": {
@@ -142,14 +179,14 @@
 						]
 					}
 				}
-            }
-        },
+			}
+		},
 		{
-            "path" : "pages/shuntBackManage/cancellingStocks",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "调回退库",
-                "enablePullDownRefresh": false,
+			"path" : "pages/shuntBackManage/cancellingStocks",
+			"style" :                                                                                    
+			{
+				"navigationBarTitleText": "调回退库",
+				"enablePullDownRefresh": false,
 				// 将回弹属性关掉
 				"bounce":"none",
 				"app-plus":{
@@ -166,61 +203,61 @@
 						]
 					}
 				}
-            }
-        },
+			}
+		},
 		{
-		    "path" : "pages/shuntBackManage/detail",
-		    "style" :                                                                                    
-		    {
-		        "navigationStyle": "custom" ,// 隐藏系统导航栏
-		        "navigationBarTextStyle": "white" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一
-		    }
+			"path" : "pages/shuntBackManage/detail",
+			"style" :                                                                                    
+			{
+				"navigationStyle": "custom" ,// 隐藏系统导航栏
+				"navigationBarTextStyle": "white" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一
+			}
 		},
 		{
-		    "path" : "pages/shuntBackManage/shelfList",
-		    "style" :
-		    {
-		        "navigationBarTitleText": "选择货架",
-		        "enablePullDownRefresh": false
-		    }
+			"path" : "pages/shuntBackManage/shelfList",
+			"style" :
+			{
+				"navigationBarTitleText": "选择货架",
+				"enablePullDownRefresh": false
+			}
 		},
 		{
-		    "path" : "pages/shuntBackManage/chooseProduct",
-		    "style" :
-		    {
-		        "navigationBarTitleText": "选择产品",
-		        "enablePullDownRefresh": false
-		    }
+			"path" : "pages/shuntBackManage/chooseProduct",
+			"style" :
+			{
+				"navigationBarTitleText": "选择产品",
+				"enablePullDownRefresh": false
+			}
 		},
 		{
-		    "path" : "pages/shuntBackManage/addBackOrder",
-		    "style" :
-		    {
-		        "navigationBarTitleText": "新增调回单",
+			"path" : "pages/shuntBackManage/addBackOrder",
+			"style" :
+			{
+				"navigationBarTitleText": "新增调回单",
 				"navigationStyle": "custom"
-		    }
-		},
-		{
-		    "path" : "pages/replenishmentManage/replenishmentList",
-		    "style" :
-		    {
-		        "navigationBarTitleText": "补货管理",
-		        "enablePullDownRefresh": false,
-		        "app-plus":{
-		        	"titleNView": {
-		        		"titleAlign": "left",
-		        		"buttons": [ //原生标题栏按钮配置,
-		        			{
-		        				"text": "\ue64e 待补货" ,//原生标题栏增加分享按钮,点击事件可通过页面的 onNavigationBarButtonTap 函数进行监听u
-		        				"fontSrc": "/static/iconfont/iconfont.ttf",
-		        				"fontSize": "14",
+			}
+		},
+		{
+			"path" : "pages/replenishmentManage/replenishmentList",
+			"style" :
+			{
+				"navigationBarTitleText": "补货管理",
+				"enablePullDownRefresh": false,
+				"app-plus":{
+					"titleNView": {
+						"titleAlign": "left",
+						"buttons": [ //原生标题栏按钮配置,
+							{
+								"text": "\ue64e 待补货" ,//原生标题栏增加分享按钮,点击事件可通过页面的 onNavigationBarButtonTap 函数进行监听u
+								"fontSrc": "/static/iconfont/iconfont.ttf",
+								"fontSize": "14",
 								"color": "#ffffff",
-		        				"width":"90px"
-		        			}
-		        		]
-		        	}
-		        }
-		    }
+								"width":"90px"
+							}
+						]
+					}
+				}
+			}
 		},
 		{
 			"path" : "pages/soldOut/shelfList",
@@ -290,18 +327,11 @@
 						"navigationBarTextStyle": "white" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一
 					}
 		}
-        ,{
-            "path" : "pages/common/printTag/printTag",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "打印标签",
-                "enablePullDownRefresh": false
-            }
-        },
-		{
-			"path": "pages/stock/index", // 库存
-			"style": {
-				"navigationBarTitleText": "库存",
+		,{
+			"path" : "pages/common/printTag/printTag",
+			"style" :                                                                                    
+			{
+				"navigationBarTitleText": "打印标签",
 				"enablePullDownRefresh": false
 			}
 		},
@@ -333,13 +363,6 @@
 				"enablePullDownRefresh": false
 			}
 		},
-		{
-			"path": "pages/sales/index", // 销售
-			"style": {
-				"navigationBarTitleText": "销售",
-				"enablePullDownRefresh": false
-			}
-		},
 		{
 			"path": "pages/sales/list", // 销售列表
 			"style": {
@@ -520,189 +543,189 @@
 			}
 		},
 		{
-		    "path" : "pages/webviews/openview",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "网页",
-		        "enablePullDownRefresh": false
-		    }
+			"path" : "pages/webviews/openview",
+			"style" :                                                                                    
+			{
+				"navigationBarTitleText": "网页",
+				"enablePullDownRefresh": false
+			}
 		}
-        ,{
-            "path" : "pages/sales/salesRecord",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "销售记录",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/approveStore/list",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "门店审核",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/approveStore/authPass",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "审核通过",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/approveStore/detail",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "门店审核详情",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/shelfSetting/shelfList",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "选择货架",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/shelfSetting/shelfSet",
-            "style": {
-            			"navigationStyle": "custom" ,// 隐藏系统导航栏
-            			"navigationBarTextStyle": "black" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一
-            		}
-        }
-        ,{
-            "path" : "pages/shelfSetting/editShelf",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "修改货架名称",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/shelfSetting/searchShelfHw",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "按产品搜索",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/shelfSetting/editShelfHw",
+		,{
+			"path" : "pages/sales/salesRecord",
+			"style" :                                                                                    
+			{
+				"navigationBarTitleText": "销售记录",
+				"enablePullDownRefresh": false
+			}
+			
+		}
+		,{
+			"path" : "pages/approveStore/list",
+			"style" :                                                                                    
+			{
+				"navigationBarTitleText": "门店审核",
+				"enablePullDownRefresh": false
+			}
+			
+		}
+		,{
+			"path" : "pages/approveStore/authPass",
+			"style" :                                                                                    
+			{
+				"navigationBarTitleText": "审核通过",
+				"enablePullDownRefresh": false
+			}
+			
+		}
+		,{
+			"path" : "pages/approveStore/detail",
+			"style" :                                                                                    
+			{
+				"navigationBarTitleText": "门店审核详情",
+				"enablePullDownRefresh": false
+			}
+			
+		}
+		,{
+			"path" : "pages/shelfSetting/shelfList",
+			"style" :                                                                                    
+			{
+				"navigationBarTitleText": "选择货架",
+				"enablePullDownRefresh": false
+			}
+			
+		}
+		,{
+			"path" : "pages/shelfSetting/shelfSet",
+			"style": {
+						"navigationStyle": "custom" ,// 隐藏系统导航栏
+						"navigationBarTextStyle": "black" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一
+					}
+		}
+		,{
+			"path" : "pages/shelfSetting/editShelf",
+			"style" :                                                                                    
+			{
+				"navigationBarTitleText": "修改货架名称",
+				"enablePullDownRefresh": false
+			}
+			
+		}
+		,{
+			"path" : "pages/shelfSetting/searchShelfHw",
+			"style" :                                                                                    
+			{
+				"navigationBarTitleText": "按产品搜索",
+				"enablePullDownRefresh": false
+			}
+			
+		}
+		,{
+			"path" : "pages/shelfSetting/editShelfHw",
 			"style": {
 						"navigationStyle": "custom" ,// 隐藏系统导航栏
 						"navigationBarTextStyle": "black" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一
 					}   
-        }
-        ,{
-            "path" : "pages/shelfSetting/addShelfHw",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "新增货位",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/shelfSetting/bindProduct",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "绑定产品",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/shelfSetting/batchPrint",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "批量打印",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/shelfSetting/quickReplenish",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "快速补货",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/stockCheck/shelfList",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "选择货架",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/stockCheck/startCheck",
-            "style": {
-            	"navigationBarTitleText": "库存盘点",
-            	"enablePullDownRefresh": false,
-            	"app-plus":{
-            		"titleNView": {
-            			"titleAlign": "left",
-            			"buttons": [ //原生标题栏按钮配置,
-            				{
-            					"text": "\ue694 盘点历史" ,//原生标题栏增加分享按钮,点击事件可通过页面的 onNavigationBarButtonTap 函数进行监听u
-            					"fontSrc": "/static/iconfont/iconfont.ttf",
-            					"fontSize": "14",
+		}
+		,{
+			"path" : "pages/shelfSetting/addShelfHw",
+			"style" :                                                                                    
+			{
+				"navigationBarTitleText": "新增货位",
+				"enablePullDownRefresh": false
+			}
+			
+		}
+		,{
+			"path" : "pages/shelfSetting/bindProduct",
+			"style" :                                                                                    
+			{
+				"navigationBarTitleText": "绑定产品",
+				"enablePullDownRefresh": false
+			}
+			
+		}
+		,{
+			"path" : "pages/shelfSetting/batchPrint",
+			"style" :                                                                                    
+			{
+				"navigationBarTitleText": "批量打印",
+				"enablePullDownRefresh": false
+			}
+			
+		}
+		,{
+			"path" : "pages/shelfSetting/quickReplenish",
+			"style" :                                                                                    
+			{
+				"navigationBarTitleText": "快速补货",
+				"enablePullDownRefresh": false
+			}
+			
+		}
+		,{
+			"path" : "pages/stockCheck/shelfList",
+			"style" :                                                                                    
+			{
+				"navigationBarTitleText": "选择货架",
+				"enablePullDownRefresh": false
+			}
+			
+		}
+		,{
+			"path" : "pages/stockCheck/startCheck",
+			"style": {
+				"navigationBarTitleText": "库存盘点",
+				"enablePullDownRefresh": false,
+				"app-plus":{
+					"titleNView": {
+						"titleAlign": "left",
+						"buttons": [ //原生标题栏按钮配置,
+							{
+								"text": "\ue694 盘点历史" ,//原生标题栏增加分享按钮,点击事件可通过页面的 onNavigationBarButtonTap 函数进行监听u
+								"fontSrc": "/static/iconfont/iconfont.ttf",
+								"fontSize": "14",
 								"color": "#00aaff",
-            					"width":"120px"
-            				}
-            			]
-            		}
-            	}
-            }
-        }
-        ,{
-            "path" : "pages/stockCheck/submitStockCheck",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "提交盘点单",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/stockCheck/checkRecord",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "盘点历史",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/batchShelves/index",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "批量上架—选层",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/batchShelves/scanProduct",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "扫描条形码",
-                "enablePullDownRefresh": false,
+								"width":"120px"
+							}
+						]
+					}
+				}
+			}
+		}
+		,{
+			"path" : "pages/stockCheck/submitStockCheck",
+			"style" :                                                                                    
+			{
+				"navigationBarTitleText": "提交盘点单",
+				"enablePullDownRefresh": false
+			}
+			
+		}
+		,{
+			"path" : "pages/stockCheck/checkRecord",
+			"style" :                                                                                    
+			{
+				"navigationBarTitleText": "盘点历史",
+				"enablePullDownRefresh": false
+			}
+			
+		}
+		,{
+			"path" : "pages/batchShelves/index",
+			"style" :                                                                                    
+			{
+				"navigationBarTitleText": "批量上架—选层",
+				"enablePullDownRefresh": false
+			}
+			
+		}
+		,{
+			"path" : "pages/batchShelves/scanProduct",
+			"style" :                                                                                    
+			{
+				"navigationBarTitleText": "扫描条形码",
+				"enablePullDownRefresh": false,
 				"app-plus":{
 					"titleNView": {
 						"titleAlign": "left",
@@ -717,15 +740,15 @@
 						]
 					}
 				}
-            }
-            
-        }
-        ,{
-            "path" : "pages/batchShelves/searchProduct",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "产品编码搜索",
-                "enablePullDownRefresh": false,
+			}
+			
+		}
+		,{
+			"path" : "pages/batchShelves/searchProduct",
+			"style" :                                                                                    
+			{
+				"navigationBarTitleText": "产品编码搜索",
+				"enablePullDownRefresh": false,
 				"app-plus":{
 					"titleNView": {
 						"titleAlign": "left",
@@ -740,15 +763,15 @@
 						]
 					}
 				}
-            }
-            
-        }
-        ,{
-            "path" : "pages/batchShelves/cartList",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "批量上架",
-                "enablePullDownRefresh": false,
+			}
+			
+		}
+		,{
+			"path" : "pages/batchShelves/cartList",
+			"style" :                                                                                    
+			{
+				"navigationBarTitleText": "批量上架",
+				"enablePullDownRefresh": false,
 				"app-plus":{
 					"titleNView": {
 						"titleAlign": "left",
@@ -770,39 +793,39 @@
 						]
 					}
 				}
-            }
-        },{
-            "path" : "pages/batchShelves/editShelfHw",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "编辑上架信息",
-                "enablePullDownRefresh": false
-            }
-        }
-        ,{
-            "path" : "pages/batchShelves/setProductCost",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "结算价设置",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/batchShelves/batchPrint/batchPrint",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "批量打印",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/shelfOrder/shelfOrder",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "货架订单",
-                "enablePullDownRefresh": false,
+			}
+		},{
+			"path" : "pages/batchShelves/editShelfHw",
+			"style" :                                                                                    
+			{
+				"navigationBarTitleText": "编辑上架信息",
+				"enablePullDownRefresh": false
+			}
+		}
+		,{
+			"path" : "pages/batchShelves/setProductCost",
+			"style" :                                                                                    
+			{
+				"navigationBarTitleText": "结算价设置",
+				"enablePullDownRefresh": false
+			}
+			
+		}
+		,{
+			"path" : "pages/batchShelves/batchPrint/batchPrint",
+			"style" :                                                                                    
+			{
+				"navigationBarTitleText": "批量打印",
+				"enablePullDownRefresh": false
+			}
+			
+		}
+		,{
+			"path" : "pages/shelfOrder/shelfOrder",
+			"style" :                                                                                    
+			{
+				"navigationBarTitleText": "货架订单",
+				"enablePullDownRefresh": false,
 				"app-plus":{
 					"titleNView": {
 						"titleAlign": "left",
@@ -817,101 +840,78 @@
 						]
 					}
 				}
-            }
-            
-        }
-        ,{
-            "path" : "pages/shelfOrder/orderDetail",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "货架订单详情",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/statistics/index",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "销售统计",
-                "enablePullDownRefresh": false,
-                "app-plus":{
-                	"titleNView": {
-                		"titleAlign": "left",
-                		"buttons": [ //原生标题栏按钮配置,
-                			{
-                				"text": "\ue626 本周" ,//原生标题栏增加分享按钮,点击事件可通过页面的 onNavigationBarButtonTap 函数进行监听u
-                				"fontSrc": "/static/iconfont/iconfont.ttf",
-                				"fontSize": "14",
-                				"color": "#00aaff",
-                				"width":"90px"
-                			}
-                		]
-                	}
-                }
-            }
-            
-        }
-		,{
-		    "path" : "pages/statistics/chooseShelf",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "选择客户",
-		       "enablePullDownRefresh": false
-		    }
-		    
-		}
-        ,{
-            "path" : "pages/vinAnalyse/shelfList",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "选择货架",
-                "enablePullDownRefresh": false
-            }  
-        }
-		,{
-		    "path" : "pages/vinAnalyse/fitProductlist",
-		    "style" :                                                                                    
-		    {
+			}
+			
+		}
+		,{
+			"path" : "pages/shelfOrder/orderDetail",
+			"style" :                                                                                    
+			{
+				"navigationBarTitleText": "货架订单详情",
+				"enablePullDownRefresh": false
+			}
+			
+		}
+		,{
+			"path" : "pages/statistics/chooseShelf",
+			"style" :                                                                                    
+			{
+				"navigationBarTitleText": "选择客户",
+			   "enablePullDownRefresh": false
+			}
+			
+		}
+		,{
+			"path" : "pages/vinAnalyse/shelfList",
+			"style" :                                                                                    
+			{
+				"navigationBarTitleText": "选择货架",
+				"enablePullDownRefresh": false
+			}  
+		}
+		,{
+			"path" : "pages/vinAnalyse/fitProductlist",
+			"style" :                                                                                    
+			{
 			   "navigationBarTitleText": "适配产品统计",
-		       "enablePullDownRefresh": false,
+			   "enablePullDownRefresh": false,
 			   "app-plus":{
-			   	"titleNView": {
-			   		"titletext": "适配产品统计"
-			   	}
+				"titleNView": {
+					"titletext": "适配产品统计"
+				}
 			   }
-		    }  
-		}
-        ,{
-            "path" : "pages/vinAnalyse/shelfAnalyse",
-            "style": {
-            	"enablePullDownRefresh": false,
-            	"app-plus":{
-            		"titleNView": {
+			}  
+		}
+		,{
+			"path" : "pages/vinAnalyse/shelfAnalyse",
+			"style": {
+				"enablePullDownRefresh": false,
+				"app-plus":{
+					"titleNView": {
 						"titletext":"VIN分析",
-            			"titleAlign": "left",
-            			"buttons": [ //原生标题栏按钮配置,
-            				{
-            					"text": "\ue626 适配产品统计" ,//原生标题栏增加分享按钮,点击事件可通过页面的 onNavigationBarButtonTap 函数进行监听u
-            					"fontSrc": "/static/iconfont/iconfont.ttf",
-            					"fontSize": "14",
-            					"color": "#00aaff",
-            					"width":"140px"
-            				}
-            			]
-            		}
-            	}
-            }
-        }
-        ,{
-            "path" : "pages/soldOut/chooseProduct",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "选择待补货产品",
-                "enablePullDownRefresh": false
-            }
-            
-        }
+						"titleAlign": "left",
+						"buttons": [ //原生标题栏按钮配置,
+							{
+								"text": "\ue626 适配产品统计" ,//原生标题栏增加分享按钮,点击事件可通过页面的 onNavigationBarButtonTap 函数进行监听u
+								"fontSrc": "/static/iconfont/iconfont.ttf",
+								"fontSize": "14",
+								"color": "#00aaff",
+								"width":"140px"
+							}
+						]
+					}
+				}
+			}
+		}
+		,{
+			"path" : "pages/soldOut/chooseProduct",
+			"style" :                                                                                    
+			{
+				"navigationBarTitleText": "选择待补货产品",
+				"enablePullDownRefresh": false
+			}
+			
+		}
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

+ 2 - 1
pages/batchShelves/scanProduct.vue

@@ -222,6 +222,7 @@
 			init(){
 				const _this = this
 				// 初始化
+				//#ifdef APP-PLUS
 				this.barcode = plus.barcode.create('barcode', [
 					plus.barcode.QR,
 					plus.barcode.EAN13,
@@ -241,7 +242,7 @@
 					frameColor: '#00aaff',
 					scanbarColor: '#00aaff'
 				})
-				 
+				//#endif 
 				// 扫码成功后
 				this.barcode.onmarked = function(type, result) {
 					console.log(type,result)

+ 2 - 0
pages/replenishmentManage/scanCodePrint.vue

@@ -156,6 +156,7 @@
 			init(){
 				const _this = this
 				// 初始化
+				//#ifdef APP-PLUS
 				this.barcode = plus.barcode.create('barcode', [], {
 					top:'0px',
 					left:'0px',
@@ -165,6 +166,7 @@
 					frameColor: '#00aaff',
 					scanbarColor: '#00aaff'
 				})
+				//#endif
 				// 设置高度
 				const query = uni.createSelectorQuery().in(this);
 				query.select('#barcode').boundingClientRect(data => {

+ 5 - 2
pages/stock/detaiList.vue

@@ -2,7 +2,7 @@
 	<view class="st-detailList-wrap">
 		<view class="panel-box">
 			<view class="type-box">
-				<u-subsection @change="sectionChange" mode="subsection" height="60" :list="list" :current="curNow" :active-color="$config('primaryColor')"></u-subsection>
+				<u-subsection @change="sectionChange" mode="subsection" :height="60" :list="list" :current="curNow" :active-color="$config('primaryColor')"></u-subsection>
 			</view>
 			<view class="st-detailList-info">
 				<view class="st-detailList-tit">
@@ -112,9 +112,12 @@
 		},
 		onLoad(option) {
 			this.theme = getApp({ allowDefault: true }).globalData.theme
-			this.stockInfo = option.data ? JSON.parse(option.data) : null
+			this.stockInfo = this.$store.state.vuex_tempData
 			this.getList()
 		},
+		onUnload() {
+			this.$store.state.vuex_tempData = null
+		},
 		methods: {
 			// 列表
 			getList(pageNo){

+ 2 - 1
pages/stock/stockSearch.vue

@@ -173,7 +173,8 @@
 			},
 			// 详情
 			getDetail(data){
-				uni.navigateTo({ url: "/pages/stock/detaiList?data="+JSON.stringify(data) })
+				this.$store.state.vuex_tempData = data
+				uni.navigateTo({ url: "/pages/stock/detaiList" })
 			}
 		}
 	}

+ 5 - 0
pages/xtNotice/xtNoticeDetail/xtNoticeDetail.vue → pages/xtNotice/xtNoticeDetail.vue

@@ -6,7 +6,12 @@
 				<view class="messageTime">{{detailsData.releaseDate}} 发布</view>
 			</view>
 			<view class="messageContent" v-if="detailsData.type!='tx'">
+			 <!-- #ifdef APP-PLUS -->
 			  <mp-html :content="detailsData.content" />
+			 <!-- #endif -->
+			 <!-- #ifdef APP-HARMONY -->
+			 <rich-text :nodes="detailsData.content"></rich-text>
+			 <!-- #endif -->
 			  <view class="msgFujian">
 				  <view v-if="detailsData.imgPaths&&detailsData.imgPaths.length">
 					  <view class="tits">图片:</view>

+ 2 - 0
uni_modules/mp-html/components/mp-html/mp-html.vue

@@ -433,7 +433,9 @@ export default {
             } else if (href.includes('://')) {
               // 打开外链
               if (this.copyLink) {
+				//#ifdef APP-PLUS
                 plus.runtime.openWeb(href)
+				//#endif
               }
             } else {
               uni.navigateTo({